Fix removeSsvValidator to work with SSV Clusters with ETH payments#2908
Merged
Conversation
naddison36
requested review from
clement-ux,
shahthepro and
sparrowDom
as code owners
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #2908 +/- ##
=======================================
Coverage 50.83% 50.83%
=======================================
Files 110 110
Lines 4873 4873
Branches 1353 1353
=======================================
Hits 2477 2477
Misses 2392 2392
Partials 4 4 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
naddison36
added a commit
that referenced
this pull request
Jun 10, 2026
* New CompoundingStakingStrategy without SSV functions. Refactored CompoundingStakingSSVStrategy to inherit CompoundingStakingStrategy. Removed ConsolidationController. Removed migrateClusterToETH. * Moved the initialize function up in the contract * Restore the ConsolidationController. Add registerSsvValidators and stakeEth forwarding functions to the old NativeStakingStrategy * Added Talos Relayer to deploy script * Change max initial deposit to be 2048 * Initial deposit changed to 2030 * Added talosRelayer address * Allow CompoundingStakingStrategy initial deposits to be less than the stored initialDepositAmountWei * Set the new cCompoundingStakingStrategy as the default strategy of the OETH Vault * Fix contracts cron image pnpm version (#2904) * Fix contracts cron image pnpm version * Changed package.json to use pnpm * Moved deploy 197 into 196 * Remove old CompoundingStakingSSVStrategy * Removed migrateClusterToETH from NativeStakingStrategy Added withdrawSsvClusterEth to the NativeStakingStrategy and CompoundingStakingSSVStrategy Deploy script now upgrades old NativeStakingStrategy and CompoundingStakingSSVStrategy * Fixed fork tests * change pre-commit hook to pnpm (#2910) * Added more staking unit tests * Allow resetFirstDeposit to be called by the Strategist * Got CompoundingStakingSSVStrategy undersize * Fix stakeValidator Hardhat task for initial deposits * Set default first-deposit cap after SSV staking strategy upgrades * Fix removeSsvValidator to work with Clusters with ETH payments (#2908) * Allow old Compounding Staking Strategy SSV validators to be removed (#2914) * All removeSsvValidator to be called for the Compounding Staking SSV Strategy on the ConsolidationController * Split withdrawSsvClusterEth and removeStrategy into separate gov prop so the 10 validators can be removed post upgrade * Updated ValidatorState.NON_REGISTERED comment (#2916) * Added back NON_REGISTERED check on registerSsvValidator (#2915) * All removeSsvValidator to be called for the Compounding Staking SSV Strategy on the ConsolidationController * Split withdrawSsvClusterEth and removeStrategy into separate gov prop so the 10 validators can be removed post upgrade * Added back NON_REGISTERED check on registerSsvValidator * Migrate vault & cross-chain operators to the new Talos signer (+ unpause rebases) (#2911) * migrate contracts to Talso signer * fix fork tests * add the migration for the OGN rewards module * refactor deployment * add some comments * add base migration files * add remaining migrations for base and one for sonic * add hyperevm migration * remove the old relayer roles * Nicka/vanilla staking ir 1 (#2918) * Migrate vault & cross-chain operators to the new Talos signer (+ unpause rebases) (#2911) * migrate contracts to Talso signer * fix fork tests * add the migration for the OGN rewards module * refactor deployment * add some comments * add base migration files * add remaining migrations for base and one for sonic * add hyperevm migration * remove the old relayer roles * Bump deploy numbers * Add prop id to deploy 196 script * Fix Hardhat task that deposits to compounding validators * Hardhat task support for different compounding staking strategies --------- Co-authored-by: Domen Grabec <grabec@gmail.com> * Clearer error when SSV validator has already been registered (#2919) * Migrate vault & cross-chain operators to the new Talos signer (+ unpause rebases) (#2911) * migrate contracts to Talso signer * fix fork tests * add the migration for the OGN rewards module * refactor deployment * add some comments * add base migration files * add remaining migrations for base and one for sonic * add hyperevm migration * remove the old relayer roles * Bump deploy numbers * Add prop id to deploy 196 script * Clear error when SSV validator has already been registered --------- Co-authored-by: Domen Grabec <grabec@gmail.com> * Fixed withdrawSsvClusterEth to ignore consensus rewards in NativeStakingSSVStrategy (#2920) * Add prop id to deploy 196 script (#2917) --------- Co-authored-by: Domen Grabec <grabec@gmail.com>
naddison36
added a commit
that referenced
this pull request
Jun 10, 2026
* Changed initial deposit to 32.25 ETH * Change initial deposit to 32.25 ETH * Updated ValidatorState.ACTIVE comment * Keeping old 1 ETH deposit diagram as that's the referred process * Bump the deploy script number * Cap the size of the initial validator deposit * Prettier * Update stakeValidator Hardhat task to handle 32.25 initial deposits * Keep default initial deposit at 1 ETH * Bump deploy number * Bump deploy number as remove Supernova strat is before * Bump deploy number * Updated compounding staking test names * Allow CompoundingStakingStrategy initial deposits to be less than the stored initialDepositAmountWei * Vanilla validator compounding staking strategy (#2905) * New CompoundingStakingStrategy without SSV functions. Refactored CompoundingStakingSSVStrategy to inherit CompoundingStakingStrategy. Removed ConsolidationController. Removed migrateClusterToETH. * Moved the initialize function up in the contract * Restore the ConsolidationController. Add registerSsvValidators and stakeEth forwarding functions to the old NativeStakingStrategy * Added Talos Relayer to deploy script * Change max initial deposit to be 2048 * Initial deposit changed to 2030 * Added talosRelayer address * Allow CompoundingStakingStrategy initial deposits to be less than the stored initialDepositAmountWei * Set the new cCompoundingStakingStrategy as the default strategy of the OETH Vault * Fix contracts cron image pnpm version (#2904) * Fix contracts cron image pnpm version * Changed package.json to use pnpm * Moved deploy 197 into 196 * Remove old CompoundingStakingSSVStrategy * Removed migrateClusterToETH from NativeStakingStrategy Added withdrawSsvClusterEth to the NativeStakingStrategy and CompoundingStakingSSVStrategy Deploy script now upgrades old NativeStakingStrategy and CompoundingStakingSSVStrategy * Fixed fork tests * change pre-commit hook to pnpm (#2910) * Added more staking unit tests * Allow resetFirstDeposit to be called by the Strategist * Got CompoundingStakingSSVStrategy undersize * Fix stakeValidator Hardhat task for initial deposits * Set default first-deposit cap after SSV staking strategy upgrades * Fix removeSsvValidator to work with Clusters with ETH payments (#2908) * Allow old Compounding Staking Strategy SSV validators to be removed (#2914) * All removeSsvValidator to be called for the Compounding Staking SSV Strategy on the ConsolidationController * Split withdrawSsvClusterEth and removeStrategy into separate gov prop so the 10 validators can be removed post upgrade * Updated ValidatorState.NON_REGISTERED comment (#2916) * Added back NON_REGISTERED check on registerSsvValidator (#2915) * All removeSsvValidator to be called for the Compounding Staking SSV Strategy on the ConsolidationController * Split withdrawSsvClusterEth and removeStrategy into separate gov prop so the 10 validators can be removed post upgrade * Added back NON_REGISTERED check on registerSsvValidator * Migrate vault & cross-chain operators to the new Talos signer (+ unpause rebases) (#2911) * migrate contracts to Talso signer * fix fork tests * add the migration for the OGN rewards module * refactor deployment * add some comments * add base migration files * add remaining migrations for base and one for sonic * add hyperevm migration * remove the old relayer roles * Nicka/vanilla staking ir 1 (#2918) * Migrate vault & cross-chain operators to the new Talos signer (+ unpause rebases) (#2911) * migrate contracts to Talso signer * fix fork tests * add the migration for the OGN rewards module * refactor deployment * add some comments * add base migration files * add remaining migrations for base and one for sonic * add hyperevm migration * remove the old relayer roles * Bump deploy numbers * Add prop id to deploy 196 script * Fix Hardhat task that deposits to compounding validators * Hardhat task support for different compounding staking strategies --------- Co-authored-by: Domen Grabec <grabec@gmail.com> * Clearer error when SSV validator has already been registered (#2919) * Migrate vault & cross-chain operators to the new Talos signer (+ unpause rebases) (#2911) * migrate contracts to Talso signer * fix fork tests * add the migration for the OGN rewards module * refactor deployment * add some comments * add base migration files * add remaining migrations for base and one for sonic * add hyperevm migration * remove the old relayer roles * Bump deploy numbers * Add prop id to deploy 196 script * Clear error when SSV validator has already been registered --------- Co-authored-by: Domen Grabec <grabec@gmail.com> * Fixed withdrawSsvClusterEth to ignore consensus rewards in NativeStakingSSVStrategy (#2920) * Add prop id to deploy 196 script (#2917) --------- Co-authored-by: Domen Grabec <grabec@gmail.com> --------- Co-authored-by: Domen Grabec <grabec@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Code Change Checklist
To be completed before internal review begins:
Internal review: